Merge "Use %zu to print size_t" am: 46d0bb74e4 am: e1f0518aa5 am: 8315f9e882  -s ours
am: d8e8d3f4a3  -s ours

Change-Id: Ib75a47d316afd807f01f0a91f58ef299151cd694