Merge "Fix to use an API to get the default quota set"