Snap for 8358640 from 8466ade7f9fce92bb1ef8c6fd3dc01968bdf68b9 to mainline-go-ipsec-release

Change-Id: I69080b98eda1656d4b851d7a488ac5e9a8f311cc