[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given...
[automerger skipped] Merge "RESTRICT AUTOMERGE Do not compute outside given range in TextLine" into pi-dev am: e352c1f2 -s ours
am: 66e93df9
Change-Id: I1c8d52d8db52e53f15095d43e9744ece11f9c900