Merge "Fix sign-compare warnings" am: 567c45e10e am: 9fff2fbe7b
am: c9e1d100c2

Change-Id: I061c32036f1b2201e2b917d304e3142e80612e93