Snap for 8570526 from b626905f633bca85bd7a53b9cd64dcd9ed90aa15 to mainline-ipsec-release

Change-Id: I4089ab72d3a20d6113a4262b8691a2abfaeb95b0