Merge "Merge "Move column definitions to an inner class" am: ab0bb48965" into stage-aosp-master