Snap for 11096816 from 06b4d6bea1e742a8e5ea2c4433abd381db054337 to build-tools-release

Change-Id: I9cd1713759dda468fd747b1d8239d0e6f7fbbcfd