Merge "Use UIDFaker to ensure Credentials_test cleans up setting UID"