Merge "Fix compiler warnings." am: d229eec371
am: e038e5ba01

Change-Id: I6cd9d0ea2c78a70ee151fcb5118de7e299df760c