am 6541898f: am 02f0771b: Merge "Revert "cleanup: Replace pointers with out-parameters and fix-up formatting""

* commit '6541898f6738794ff59a44b121e4a300d36ec393':
  Revert "cleanup: Replace pointers with out-parameters and fix-up formatting"