Merge "Not using shell command to enable test provider" into sc-v2-dev