Fix build warnings

Change-Id: Idfdaff3a7a8f60cd8817bd306bfba28020a391c8
6 files changed