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

Change-Id: I6a8ddfc1c5fb771194f9b7d6c5eb335b0ddc70c0