Snap for 6909141 from 64665f0233bcdbbb9c9dc5b0f441a7c1fa11137c to build-tools-release

Change-Id: I52bf7c45f7eac392f99d84bc1a38cb06ad02fd4c