Snap for 8191477 from ee86670715b2f28028e6c270e07dcbd56882c5ec to tm-frc-networking-release

Change-Id: I0e33dd4fb4d9703df8d0785526da09ac7388c726