Merge "Remove undefined PRIVATE_* variable" am: 06eb77a682 am: fd643dcacf
am: 51d5ec21ec

Change-Id: I4be3e85da550039f71286299e31e9b4db729d404