Merge "Adjust format strings to work on both 32-bit and 64-bit builds"