am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE]

* commit 'acbff09932252c3bc93aebe63deb5afc2498824b':
  Fix the measurement of text bounds. [DO NOT MERGE]