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