Snap for 8570526 from b345902525130ad6ebbe052cae74cc673a5df93c to mainline-ipsec-release

Change-Id: I2d091c2d9a3e4265db589ebcfc1fd6238048b9f2