Privacy guard (1/2)

Change-Id: I4be7316a070e3061be3434379b3faca2275cb347
Merge "Privacy guard (1/2)" into android-4.4