Snap for 8820681 from ca6b4d4a1ae67e9d488781c482e8873d4c316f94 to mainline-go-sdkext-release

Change-Id: I178d3711c5110d764c556182e8da4f5edc3133d2