after code review by Dan V.
Reviewer: Dan Villafuerte
Issue: GCP-8995