fix issues in last commit
Reviewer: Dan Jao (post-commit)
Issue: GCP-9804