am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"

* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit