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

Change-Id: Ib531b73d183b62d6c3a23db7e9ed10f0a44e9277