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

Change-Id: I91d7a2e385b1acafb21bffefa7cbf51a11916c18