Merge "Snap for 11641499 from 749ad855ed8f99d87078218d8ec04225eda60d9b to build-tools-release" into build-tools-release