[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev am: e352c1f2bc -s ours am: 66e93df90a
am: 43a23b721a

Change-Id: Ie3ebb87b2a80189b7e06b93630898f5bb39715b6