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

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