VS warning fixes.

Change-Id: I19662241d56560c064cff73dbebfb2a81d226934
2 files changed