Merge "Snap for 7362618 from 93406da189f9cd0765ffe87b56fb33707b59d4b5 to build-tools-release" into build-tools-release