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