am 231a32a1: (-s ours) am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev

* commit '231a32a132011abda6dabca31446297a75914dad':
  Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""