Merge "Snap for 9680074 from 12b771b068517da26ae31b21401bbb3806d460a7 to busytown-mac-infra-release" into busytown-mac-infra-release