Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b am: 4fea890c am: f97b5672 Change-Id: I3e7a09fa3e1568696b129d28298bbf2836d1d718