Merge "Snap for 11962822 from a918a6f9275127510d2c485b277a0102d07c5978 to busytown-mac-infra-release" into busytown-mac-infra-release