Snap for 7691048 from dae325edb225518625a92ef81d3c6008fb437cd4 to build-tools-release

Change-Id: I9beb26c79ee4ac0f1aeaf0285ff44c8cf4112864