Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am: 36c5ab3542
am: 50c22adc25

* commit '50c22adc2564fa1c31b9d0aea88707da4299d6ed':
  Fix measurement to respect grapheme and span boundaries