Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81 am: 4fea890c18 am: f97b567234 am: 3b0124864c am: ff4ad59458
am: e131c48304

Change-Id: Ic5a24c00f6f437b76988330c36d7efc42d127bdb