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

Change-Id: I1dfe864d438c026940ad1a40f4dbff9ae0e3c57a