Snap for 8505378 from d5dd8af06e1b4c3bcd96a4de4bf1b8f1fbf1cbd5 to mainline-go-sdkext-release

Change-Id: I291cb47466dae9383c3005d7e1931c45f08091f2