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

Change-Id: I4a2dbe98638b9d51b6e7ad3658662a3f29267e29