Merge "Snap for 13209459 from 95b890708da19801f93e864d4436dfa1d5c33f73 to build-tools-release" into build-tools-release