Merge "Fix NPE crash when mPhone is null" into lmp-dev