DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"
am: 53ceaf677a

Change-Id: I2e50419314824c17dd1086c2e6dcb9e9e63590fa