Snap for 13217294 from baed314e5a472c32b30697c311e0dfc720e30e46 to build-tools-release

Change-Id: Iead3f0b2135d72f85215356014d31096724bb3e3