am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '9e0cb2a3ee60b0b837cb3cbbf84272616f47c879':
  Fix NPE crash when mPhone is null