Snap for 8736029 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-ipsec-release

Change-Id: I930d0be7afece7160ccdeea636283eacc07d3d7b