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

Change-Id: Icefdebafee37089acd1288eb12dcef10b148adb6