Bug: 28220065 Change-Id: Ida199c66692a1638be6990d583d2ed42583fb592
Mostly trivial changes to make cpp compiler happy. Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270