Merge "Snap for 7636515 from c5c532fc312c9e5a2f2b8fecbfc535af4ffcd245 to build-tools-release" into build-tools-release