Merge "Fix the unittest error in gcp_setup_runner_test.py." am: 24b8d4fa5f

Change-Id: I7dc854542927a9b97e8b1f6120e79002fa920359