Merge "Snap for 11985584 from 2ef92f885cb414c650de27b8963a5612b922b91e to build-tools-release" into build-tools-release