Snap for 8736029 from 683bdac642bc8e7322c71aede4c8880301f8da86 to mainline-go-extservices-release

Change-Id: Iacf59c93965dbf9c309a9926d8aeca58d111c461