Snap for 7037351 from 0f38929e89d8a7bb9ef55f32666f242e31d4802d to build-tools-release

Change-Id: I6fe8c1ad4cb1dc5ded91be011287fbc656d8b99b