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

Change-Id: I4bd0106b86e478b850c96735762e60f6ada22571