Followup to 36780, add new columns FIRST

Change-Id: Ibcc2c36d75ac4d302a5fa308d1685dc2af054022