Snap for 8570526 from 84a12a4d267411fa4a3cac53a4883653181044ee to mainline-ipsec-release

Change-Id: I9697956b188f718f188c593b1dee5c9f0d930785