Merge "Phonetic name field underlines stretch across" into oc-dev am: 1d2db44297
am: ae95c0304b

Change-Id: Ie56f8c585369af44757a58200b4af80f5eeecd3b