Snap for 8736029 from 00d4c39486f5b6c133e5f8ec99af7e007c4e3ed0 to mainline-go-sdkext-release

Change-Id: I961389aa7f408186bc4df7a4e5a74ec766f46547