Bug: 26960931 Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
Mostly trivial changes to make cpp compiler happy. Change-Id: I1b0481465c67c3bbca35a839d0764190d84ff34e (cherry picked from commit ba9a42aa7e)
ba9a42aa7e