Snap for 8347268 from c82b508c1f71f9d2ffdb5a68405eb1db20eae940 to mainline-go-extservices-release

Change-Id: I5c525dc952c1b32eb4bef02d245f455fbc85454d