Snap for 8736029 from ff9e945e1b5b5966cfc75b3c954e62076ea9ea00 to mainline-go-sdkext-release

Change-Id: I9ca3467eb4074ec54834a442947ce2f13fe602b3