[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175
am: af62f3a7b3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb67887f4b1a5860dca2569e57a74911efde801d