Snap for 10183495 from 34de7475705880e693af6bc31ba8f4aeaf7a02fb to build-tools-release

Change-Id: I024270ace7611979d268509262b5bb50cae0f880