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

* commit 'b85e561188120df65a5fa4e5963646a6c56dde5d':
  Fix NPE when phone is null