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

Change-Id: Idfd7f4ce3f9a32d174dd046c7e919b087a04217d