Snap for 12464478 from 1be1ec18adf286654ceaabdcd71de1db24a86336 to build-tools-release

Change-Id: I79c553a2cb97795683d585728fd3e2b8f30be311