Snap for 8745897 from 33da9468354b9b530712d4157298a8e0479cf2e5 to tm-frc-ipsec-release

Change-Id: I35c64420432bda32abc81ce4d3bf876fe5317f97