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

Change-Id: Ic6125cb837134ad7027ac763240a0f59534605b4