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

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