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