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

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