Merge "Move column definitions to an inner class"
am: ab0bb48965

Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8