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