am 31503723: (-s ours) am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev

* commit '315037234206c500e73a15075b996122316ce9d8':
  DO NOT MERGE Implement line breaking using ICU break iterator