Snap for 8736029 from 1c2c0f9edc2fddd036b49c23edb1f81f29ecd021 to mainline-go-extservices-release

Change-Id: I0f05e8764efe5d4844d7d058fd9c342df0773903