Snap for 7478067 from 5819393ca04902c8fea8f07062d7e38f76aa36c5 to mainline-ipsec-release

Change-Id: Iadd046aa14ef50c44bf3b1720b16525bda790b2f