Use a fixed estimate of the amount of space needed for each column and then if there is extra space, consider adding the Branch and Topic columns to the change list. Change-Id: I90ee7f3e1953468a9e81cc508c2c444e1af50efc