Merge "Fix inconsistent columns when appending cursor data" am: 9252fd8f25 am: 2bd9cefb2b am: a4b3b2b6e2

Change-Id: Iaff372e790f59f8c0b7c90494ad62e70f5dd0325