Merge "Remove use_default_creds from preprov creds"