Snap for 8347268 from 4d58e47b18322f6edca2a7a1b077edbc02c54b20 to mainline-go-ipsec-release

Change-Id: I6245c076dcd373a7625a1083c928f5311121ffc8