Merge "Stop implicit validation_resources provisioning"