am 1f71e465: am 68870199: Merge "Next phase of the move, reformat use C++ features."

* commit '1f71e465ef1544a2962299445dee03e6856ea54a':
  Next phase of the move, reformat use C++ features.