Snap for 8857176 from 324867a97a494ef05943cc0f5e635675fcb7800f to mainline-go-extservices-release

Change-Id: I900225b96830934166f90f2c950def39cd351c95