am 6936eeea: Merge "Fix formatting"

* commit '6936eeeae7125068c12c7a68087eefd612652770':
  Fix formatting