Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev am: a94d8aed24 am: 2c8f7e6ae8 am: 2c038ce0de
am: 33e07e09fe

Change-Id: I13a069fffdcd55b54dee949cc584439f373dec2f