[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

Change-Id: I2f88eecd916f2642cc3cb0c8ba91ed6348247900