Snap for 12317862 from 66020a1461ca82742e15fb7de5ed5bbef666eabc to build-tools-release

Change-Id: I94d4f2051de34152bf8162a2e5038af2f8894b23