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