Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev am: 56ff278c am: 4321d128 am: d07f3c81 Change-Id: I37ad3461ea7973bc2621a7513d86308d51547f31