Snap for 10453563 from a00441b1ee7ea275114309268c00e3b701b118f7 to mainline-ipsec-release

Change-Id: I4f00a5cc69b545ff04e97af7cac7014ffeed91dc