Merge "Fix NPE when have no phone accounts" into lmp-dev