References #1928: Renamed "Attribute" to "Column" for consistency with rest of core

Change-Id: Ia51edc45487109fb28ae2484a611cf11581a83d9
(cherry picked from commit 6bc9f3bc52ea6440f7747b6063fc314748b40ce9)
References #2315: Updated javadoc based on feedback from Kei.

Change-Id: Iac3599cead82915ed42da7fef0a6bb250299d25b
(cherry picked from commit 15fa119e2352a219850700b82bb33e36b0a849d7)