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

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