am 48effde8: am df39e8b9: (-s ours) am 7f11f2ec: Merge "Show phonetic name next to display name in UI." into mnc-dev

* commit '48effde83d8cde89b1c0f308572e8de00bc7d8d6':