Merge "Stabilize test: test_auth_empty_auth_token_file"