Merge "Snap for 7654679 from 95983cbbb6bf1fac1a00af734b1424e5bc26665a to build-tools-release" into build-tools-release