am 9a4f0ee6: am e30f16df: Merge "Round scale factors to rasterize text" into jb-mr2-dev

* commit '9a4f0ee617235299345985a7aed219e223f43f24':
  Round scale factors to rasterize text