DO NOT MERGE Phonetic name field underlines stretch across
am: c37a0018ce  -s ours

Change-Id: Ib6f3239208d384b776a8dd05190425da4c13a3de