Merge "Snap for 7691048 from f98bcdbac0bd8a30c184f0289799cdcbadd1db12 to build-tools-release" into build-tools-release