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