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

* commit '243efe13a44faf3617e2df409fa8f4bd30078a5d':
  Fix measurement to respect grapheme and span boundaries