Merge "Snap for 7588628 from 0b23b2a346542946b6b00b5ea7c578998755efd1 to build-tools-release" into build-tools-release