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

Change-Id: I6b1523445448693dcdadb2561ff738e3fb343bd8