Snap for 6823095 from 160c53955ea1b17f87cc77bf433acb220a556341 to build-tools-release

Change-Id: I0feb8b8163321cbbd7144e857b96a6af5391ec80