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

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