am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
  Adjust format strings to work on both 32-bit and 64-bit builds