Merge "Snap for 7355913 from 0839837fa43bcae64c0deb109b90be67c2b5ef37 to build-tools-release" into build-tools-release