Merge "Add more privacy tags." into pi-dev am: 0246723afe
am: 85694be18e

Change-Id: I19b61b6d7e0e5811913c65ae792a72e01f826b22