Merge "Snap for 11096816 from 9d6b3cea352fd68d9bfb4782794593b352e49829 to build-tools-release" into build-tools-release