Merge "Fix compiler warnings." am: d229eec371 am: e038e5ba01
am: 9afc73021f  -s ours

Change-Id: I7db43c579c777f00d8a3161cf6499c50ed56932b