Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into nyc-mr1-dev
* changes: [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:7d6c02de04am:5ad1deb51c[automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am:7d6c02de04Fix Layout.primaryIsTrailingPreviousAllLineOffsets
This commit is contained in: