DO NOT MERGE Remove Privacy Indicators
am: 9a560e068d

Change-Id: Ied3a51b9c47255a21e2fd29becfe4ed3400a16c7