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