Merge "Return empty set instead of null when user is not set." into nyc-mr1-dev