Snap for 8736029 from b22551509f88af77da216f5c36e6c0b428f5fbac to mainline-go-ipsec-release

Change-Id: I6890b3379d3ecfb7963f9a472ddb6fa5c0de7e95