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

Change-Id: If1f9884f32ff8c23ed33a8af9eed1e5aa67a2845