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

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