Merge "Fix -Wsize-comparison failures."
am: f2147cf2a9

Change-Id: I3818d52001f69576d9a918ad29b08915923142e3