Snap for 8358640 from a2e0086b1a3443173b9d9951ca9b11a3a6ca3d83 to mainline-go-ipsec-release

Change-Id: I47241b448d91a498b78f9fe2eb4122d35feb5330