[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 am: 43a23b72
am: d659d0f3
Change-Id: Ib2fc69007c2a825064be5402c2730dc68e003963