Snap for 11341804 from b92d58c3215a596bf289ca7b688dc3e9a774d783 to build-tools-release

Change-Id: Iadc5e0b62c3e0bbf94a1034007bf6f0656abd5f2