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