Merge "Snap for 11819167 from 054a92938d60d7826acdbe63c867e26bb3e01630 to busytown-mac-infra-release" into busytown-mac-infra-release