am da3b8fd2: am 386fde8e: am dea29b7d: Merge "Fix showing all phone nums and emails for joined contacts" into mnc-dev

* commit 'da3b8fd21ab5e69bacfb68dab24bed7f4c0a790e':
  Fix showing all phone nums and emails for joined contacts