am 416685d0: Merge "Fix format warnings"

* commit '416685d0cbab40bfc48b0e787206b5d5c2e2ec25':
  Fix format warnings