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

Change-Id: I4a7d3cace3d8ce9bd7c4f8871d3aecf69203f12b