Merge "Fix compiler warnings."
am: d229eec371

Change-Id: Ia165854532a0e2ef98b712db6f0277576c60a497