Merge "Snap for 12355814 from 0ac9a9daea5cce2e775d5da949508593e2ee9206 to build-tools-release" into build-tools-release