Merge "Snap for 11784721 from 4811a5bda0ba56ae4f0a09882fa3140173e7ede3 to build-tools-release" into build-tools-release