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