Merge "Snap for 6629315 from d894b463f17892ef3c199c6c0b003e9f6bfde14c to build-tools-release" into build-tools-release