Merge "Fix NPE when phone is null" into lmp-dev