Merge "Use %d for int32_t" am: 240201e27b
am: 63c04ff2b7

Change-Id: Ie30c55232b8b228fab1de5d827dc1bcf29c0f4a7