am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them"

* commit '43b8643e86d7c5d0d5cf536336126232454f361a':
  Fix format strings mismatching the parameters passed to them