Merge changes from topic "columnz"

* changes:
  Annotation for ContentProvider columns.
  Add accessor methods to aid testing.