Merge "Snap for 10084189 from 1f7c08e2412c8316f4978259eaace0d3d778306a to build-tools-release" into build-tools-release