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

Change-Id: Ie14feecb93a9dd4feeb1959c4478e53e87915d28