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

Change-Id: I8b601680923641d7aa7f7aabed4e072fb77a24e5