Merge "Obsolete a couple of auto-join related APIs." into nyc-dev