Merge "Deprecate certain AbstractCursor fields." into jb-dev