[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: d659d0f3ee

Change-Id: Ib2fc69007c2a825064be5402c2730dc68e003963