Snap for 8917908 from c976440a7b12fae601bb3954a654601758cf1271 to mainline-ipsec-release

Change-Id: I4f00062c41f90e03588ca648db8da62f8d106857