Snap for 8358640 from 018c12887827c60b005b79ac39f26fb707c37cc5 to mainline-go-extservices-release

Change-Id: I545430d666dbb15aab8c370d89d46230391c5180