Merge "Snap for 7671692 from ce8aa990d5e6258924933d09f4cb3ccd2d40db80 to build-tools-release" into build-tools-release