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

Change-Id: I5922d3779bef7ba390da29784883a4553944d56a