Merge "Fix -Wsize-comparison failures." am: f2147cf2a9 am: 872cc103ea
am: af01b5d1ba

Change-Id: I295854f5cdfffd2bb405deecdbe66941c8264254