Merge "Snap for 7668128 from c1c2b4f8168c4683dcd94fef13d7abf0f7a6abf1 to build-tools-release" into build-tools-release