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