Merge "Snap for 9680074 from 863ab0839dc97b882c0a46770ef9f2e92b23dfaa to busytown-mac-infra-release" into busytown-mac-infra-release