code review from dan j.
Reviewer: Dan J.
Issue: GCP-9230