Deal with some column changes.

Change-Id: I3253cd791518f1503d54011af8265ecfeac9af8c
3 files changed