Merge "Snap for 7356458 from fcd105d5ddffaf6b17330dac46723932f5724f3e to build-tools-release" into build-tools-release