Update Fixes for GCP-5667