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

Change-Id: I2a2a5056c9d6a5721ccecca7cd3ab8b20c9188e4