Merge "Snap for 10908379 from 561e19f486a43ab2030e88cfbe832095ed5c5005 to build-tools-release" into build-tools-release