Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-mr1-dev am: 56ff278c98 am: 4321d1288e
am: d07f3c8128

Change-Id: I88d12eda0340a0fa91e68f7e8b7a20ff6afa611b