Merge "Fix signed/unsigned conversion warning" am: d3a7a4c6eb  -s ours am: 4a7b2c9351  -s ours
am: 507fe957ea  -s ours

Change-Id: Idcd204abfffab7f5025b3c220197b2a8b48c6523