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

Change-Id: I0b6652ba23e569e74585a198135a1f8ee8cf957b