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

Change-Id: Iddeec91a3ca756d84f3844640e34ad2451ce7714