Merge "Clear caller identify before registering and unregistering phone acct." am: 91d5655e89
am: 35cfbaef3c

Change-Id: I224ce68a4927f2c408afc397b0910c823eb912db