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

Change-Id: Id0c8024776417d6bc5bfbd628140d420ca654db4