Merge "Fix compiler warnings." am: f1b6c7d504 am: 415f010518
am: adf64dedf5

Change-Id: I0e94519eff9eb3590ce39f132758a3f8afa44a4b