Merge "Snap for 12890411 from 9a77f14eac51e405b730184a5d26093790e3eb9d to busytown-mac-infra-release" into busytown-mac-infra-release