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

Change-Id: I42513c054183772a27fb985cee66440a88003143