Clear both ContentProvider and local identities. am: ce59a5424d am: bdfc5c63de
am: 23a83649ac

Change-Id: Ic76078d61e68e93fbe4418708870bff2d1460436