Clean up build warnings

Change-Id: I908c0ef36c5f79be3ac5ee3a78950e45b17ea4d9
7 files changed