Merge "Clear caller identify before registering and unregistering phone acct." into oc-dev
am: 5688c1935e

Change-Id: Ic23ec9ecfa166a26ce10e21f7af3e428fa69097b