Snap for 7299144 from 087b6880b76b9034c5b098d94b7b7a1208c2a40b to build-tools-release

Change-Id: I56ea22b2e756c6172639a759ad5e25979ec07061