Merge "TableDiffFormatter: Don't repeatedly call array_shift()"