Merge "[EBS] Don't disable location when DISALLOW_CONFIG_LOCATION is set"