Merge "Snap for 7973744 from e4ca4c920fa61a3277febc4be9ad69fc221cc92a to build-tools-release" into build-tools-release