Snap for 8745897 from 16c73e4bd018a3cc70a228cd254bca2e6fca6686 to tm-frc-ipsec-release

Change-Id: I2c6f026409209badad0092700f5ccc08e3725532