Snap for 8570526 from 701de756a4d026ac5e570e65671c8f00b73c2390 to mainline-ipsec-release

Change-Id: I997b47f6f68afe3cda24346a804b8d8f7dc3ac67