Merge "Golden update change auto-generated from Scuba: invocation I73200010267927138" into main