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

Change-Id: I17542d6120f01e0ba0ae273e73ad37e0de6a2f51