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

Change-Id: I7e710240386510ed1bfeb1187107ece5dc3bd6ec