Snap for 9757917 from 33ef859425eac0147dc0c9b426a9e34f5b8bb4b2 to build-tools-release

Change-Id: I84df513f4797a470cc7ea34d096ce9ce3f5bc779