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

Change-Id: I77c99739b40536273bb04f2cd24ad433d1858e6c