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

Change-Id: Ia03b71c5397a9fa8c72fc7b8ef5746218328bf1e