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

Change-Id: I630708fa87b5ee6dedcc8651f722cb04ddcee48e