am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1

* commit '316ca5059ebd7270a04da5649d25653c355e158d':
  Re-use SpanSets in TextLine