Merge "Fix issue where characters overlap" into oc-dr1-dev am: aa9807d5d4 am: 42057f9ef7
am: 33ff268e48

Change-Id: I27143cfe722e9f16908c1ff3cb9079e653dcdbd9