Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev
am: 56ff278c98

Change-Id: I5d0aa8799d45d5a75d46691aec2d3487bb27a0a7