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

Change-Id: Id394ac3139fe6a42ac0ac1431e5efe4b88a57e91