Merge "Snap for 13206524 from 95eef6ebbe00dff6bde3ec2440964ad648ad45e5 to busytown-mac-infra-release" into busytown-mac-infra-release