Snap for 8189365 from 91b18b36827744ffd26da5ee18e74954866d3a63 to tm-frc-networking-release

Change-Id: Iedd303c75d9acf8431848fdf49f14e9e1a895ffa