Merge "Snap for 10183495 from 34de7475705880e693af6bc31ba8f4aeaf7a02fb to build-tools-release" into build-tools-release