Merge "Fix issue where characters overlap" into oc-dr1-dev
am: aa9807d5d4

Change-Id: Ia4d2775d924d006d8c7fa7b2a8f02f8bd852b688