Merge "Add SmallTest annotation to UserCredentialsTest"