Merge "Snap for 12849501 from d543736a16cab40cb18dceeca82f42f845240712 to busytown-mac-infra-release" into busytown-mac-infra-release