am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

* commit 'f55129731005f6939d40d7c8a0c0f8c93b472f98':
  Fix text rendering [DO NOT MERGE]