fix test breakage after git merge
fix test breakage after git merge

Change-Id: Ifca412718379f7346c0905bc257a8a90cc28e29e
GitOrigin-RevId: 528993726072b5c193e68dd4d707b078233a4688

GoogleCloudPlatform/gcpdiag,GoogleCloudPlatform/gcpdiag,GoogleCloudPlatform/gcpdiag