Snap for 11784721 from 45e6c488a5ad73455d2b70c2ef7d9783cf893dfd to build-tools-release

Change-Id: I45ae03925807b98fd7f059ffa4cbb9cc3075b264