Snap for 12355814 from b9ca530592671f1a59a16a89d0a3a78ec7075799 to build-tools-release

Change-Id: I52e534817e41e6c6bf725dc82395a2a8304db121