am d8ca6e55: am b4d5b4f6: am 718b8028: (-s ours) am bd532261: am ffba5739: am d60d0c1c: (-s ours) am f5512973: am fe675441: am ce22440d: Fix text rendering [DO NOT MERGE]

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