am 22b99e3a: am 45aa0227: Merge "Fix potential format string vulnerability"

* commit '22b99e3a9a5797deada897102e71e9a88ae46d24':
  Fix potential format string vulnerability