Merge "Snap for 7694993 from 055abbb4d6c7fac54a28f4fc1193ba44ed49ae50 to build-tools-release" into build-tools-release