Snap for 9678129 from d73b4aa2f9782e8151d31593576592d8da0da570 to mainline-ipsec-release

Change-Id: I365c49f75643d1bbb39880d1fec67d61806e9f4f