Snap for 11962822 from c1abbcfebea71de23da738105c0c221823719ea9 to busytown-mac-infra-release

Change-Id: I4d11fc79ab2c11871eef2cc110b242415caaaf60