Snap for 11878398 from 214e20a8163a4cabd171917d6a5aab53d9147662 to busytown-mac-infra-release

Change-Id: I3bf61050d1a6a786c1dd59a732dc8cbab0c2ba65