DO NOT MERGE Remove Privacy Indicators am: 9a560e068d
am: ec3e0ecaca

Change-Id: I395d347a18ba811f6ff84d8a873ad384e39e364f