GCP-8660, GCP-8687

Code Reviewer: Dan Jao

No Issues