Merge "Snap for 11784721 from 83a914b543d3d3a3f0572ca49c861f8eddab2942 to build-tools-release" into build-tools-release