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

* commit '8311d9e5fc21e21c6a8139d22137fa66b9b893b1':
  Fix NPE when phone is null