[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 skip reason: subject contains skip directive

Change-Id: Ie6db3a3499cb02ef1bd34232a4ca8fb362b18e7d