Merge "Snap for 13196478 from 838bd34deecb3715b2b4006edede2ab79e42e336 to build-tools-release" into build-tools-release