Merge "Snap for 11641499 from 488f64fde2e8d8a3b163fe44807821a00e2c1448 to build-tools-release" into build-tools-release