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

Change-Id: I9ce67cef2b8dc4e46be796c048cf84d9ec04d5c0