Merge "Snap for 11904128 from f8143fba3be07bbe949b0fe2a59b47ddbac7d2b5 to busytown-mac-infra-release" into busytown-mac-infra-release