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

Change-Id: I22a48bda7f656a3da50006cbb9e49a09569db10f