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