Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev