Merge "Fix compiler warnings." am: 2623d1370f
am: 8f7122a989

Change-Id: Ia01a7af4254c05e41a0edde9b386ec6087dbc5b2