am 69c06ebb: am c656552b: am b973c146: Merge "Fix NPE in QuickContactActivity" into lmp-dev

* commit '69c06ebb5850710b07f8fee06e23fde604b4c5d0':
  Fix NPE in QuickContactActivity