Snap for 11341804 from 572f3a37bb0d46c428bc816c42c3961a41357bdf to build-tools-release

Change-Id: Iac5fe755c780d63240dc6d86b69b18451eea2be8