Merge "Snap for 11880863 from a0a93b8d557d77597bcff153dd63a0ec9b6033d9 to build-tools-release" into build-tools-release