Snap for 9757917 from da332d46c2467b573f97e6c026975d50b7c5b8e2 to build-tools-release

Change-Id: I7539c6168283450b288947c0f05f040968c80172