Merge "[Manual] Rename non-public non-static variables to mCamelCase"
am: d4403f0598

Change-Id: I66eb9641c68813798f37b1d9e7db7d00c226f1fb