Revert "Privacy guard (1/2)"

This reverts commit b0ffdc766016c2a3b998aa4652c5a1a41bd43678.

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