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

Change-Id: I9de3d654e367f8964b2f3b6f3c1d9ef931fa37c0