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

Change-Id: Ic0da21d13267687d273e838caf1bab910f04a041