Snap for 7478067 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-ipsec-release

Change-Id: I0c0d8efdf4a84ab41c4ca4abc6904da65dd6f576