Merge "Snap for 13206524 from a13b41d838845124fa2931c7dc39917c78039e66 to busytown-mac-infra-release" into busytown-mac-infra-release