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

Change-Id: I73af3fbc20c1e88552f093e101e7a14727e9081c