Merge "Snap for 6869441 from 087552a89baf327fcec31e54653985989e5f6c03 to build-tools-release" into build-tools-release