Snap for 8857176 from ac851b04c1256097ee982d8eb83161fbe18fbe9b to mainline-go-extservices-release

Change-Id: Idf08e21214f84aaf09ccf2dd14067ad73928ceaf