DO NOT MERGE Revert Privacy Indicators to P
am: 5c837108e2

Change-Id: I620ec40368bb4cb12ee7dbb9a93d65b02edac81a