Merge "Snap for 11794311 from 996abf256e0767594d0a509c5ad18b44dca83e89 to build-tools-release" into build-tools-release