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

Change-Id: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388