Reviewer:
Project task:
Note: Upon merging this PR, you are responsible for updating the affected products to the latest version of this repo.
- PRs exists for affected products to bump up to latest commit (in this PR)
- Ensure privacy reference tests in the above PRs pass