Snap for 8570526 from 9c2389bdfe0d5a0599e1318ee950eb55e725f650 to mainline-ipsec-release

Change-Id: Ie49ec6439c75bb306b87f15a53e8185f55118a60