Snap for 8358640 from ee86670715b2f28028e6c270e07dcbd56882c5ec to mainline-go-extservices-release

Change-Id: Ib34d3beb7f2f51171b47323fda66eb39788a3b9f