changes after code review with Dan V.
Reviewer: Dan V. (post commit)
Issue: GCP-8995