Snap for 8570526 from e863e8b505c2a6ab4a881966460c27cc5e645fc0 to mainline-ipsec-release

Change-Id: I550f38f198bf05210b0251cf232f6493ef28332a