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

Change-Id: I6a52430c5a9710321ded81442dde850c5462749d