am a5b91742: am 6936eeea: Merge "Fix formatting"

* commit 'a5b9174273368fced1a437e1634832d4f42efa24':
  Fix formatting