Snap for 7691048 from f98bcdbac0bd8a30c184f0289799cdcbadd1db12 to build-tools-release

Change-Id: I98ebee36255590fa10dc078c9e907a20165d4174