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