[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 am: af62f3a7b3 -s ours am: 86ddd9eb6a -s ours am: eab868fa63 am: 59bfe5d653
am: e548ea7764

Change-Id: Ib2e9df3d956569e34ed7fa4ab25ed4409682f821