Merge "Use %zu to print size_t" am: 46d0bb74e4
am: e1f0518aa5

Change-Id: Ie4a29254f4968296bab14ffc8c19e8c72132aac4