Address code review comments.
Address code review comments.

GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid,GoogleCloudPlatform/testgrid