Merge "Minimal switch to C++ to make future cleanup easier."
am: 0e19401352

Change-Id: Ic4b05ff325ba6572d98d24d8c38a8c0ca5a9023b