Merge "Remove deprecated fields in AbstractCursor."