Snap for 8857176 from 1ce5be5b7d6e5e8b0634492723ca57fd3bb86e83 to mainline-go-extservices-release

Change-Id: I9534e6d91df2004fe9b82720c8bf3d5c0603c344