Snap for 8358640 from 4783e793f2b852827560a2d96d4c2324cf93137b to mainline-go-extservices-release

Change-Id: I28878d19995c8eb43b3d52e3ec17d0659363fe97