Snap for 8736029 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-go-extservices-release

Change-Id: Iae7e4dee5295016bb6092fe266d9537d19d3865e