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

Change-Id: Ie296e5c7186739812d8ea2a1bc4806da5e92563a