Merge "Fix NPE in QuickContactActivity" into lmp-dev
tree: 08eebed9d7fad62d50bb2b34ba0a5730ebbc1b2d
  1. src/
  2. TestCommon/
  3. tests/