Snap for 8358640 from 7b50b3f18e06b9e9b78bd4487e7cdfbe1982391f to mainline-go-extservices-release

Change-Id: I9301e136d34968a71d0ec6391b885c7e732b9b50