Snap for 8960563 from 57d2b8ec360b2af98c53ff8038b0af120ab77f29 to build-tools-release

Change-Id: Ie3305ed70ab2e0b325d00baa5a214c93cb2c26ae