Merge "Merge "Move column definitions to an inner class" am: ab0bb489" into stage-aosp-master am: cb996b55 am: 9e86604c Change-Id: I8118b8b1041ade5e19fee06289d1ba4c1848837f