Merge "Fix diff-and-update-golden.sh path" into main