This change also adds workaround to display Thai composing letters correctly. Bug: 6753168 Change-Id: Ibd42ebb40df08b5de32b3500f10003c4a5de4897
Bug: 6070772 Change-Id: Ib7078d062801e17db500f0cd0b4b53d5433b75d1