Snap for 8189365 from e94f6887b541219b84e5029b2b2570a1979b544a to tm-frc-networking-release

Change-Id: I6441359dd5a9e7db14ba2b31bbfa69b298f64317