am 0ebe6918: am e3d598e2: Merge "cleanup: Replace pointers with out-parameters and fix-up formatting"

* commit '0ebe69184c7b09b3f5caff5ebc6524840104cf6d':
  cleanup: Replace pointers with out-parameters and fix-up formatting