Merge "Snap for 13206524 from 4a09ba2b43b3b0ea876676eb3917b421fc6280a1 to busytown-mac-infra-release" into busytown-mac-infra-release