Fix build warnings

Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9
2 files changed