am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev

* commit '0851945a72e10e1d31aafa459f7e69cdf7087bee':
  Fix text rendering