Snap for 12572747 from de55c7d9ebd1e2f8307da5c087e28cb541cd622d to build-tools-release

Change-Id: I03905f2dcb5ca1f42f2e493edfe44839fd2fab32