Merge "Snap for 12957650 from 4396082b3b049ecde5dd7df6c7bce7af7059d55a to busytown-mac-infra-release" into busytown-mac-infra-release