am aad92067: Merge "Reformatting"

* commit 'aad92067bf4eecda81a4c331ee4dec70483c5104':
  Reformatting