Snap for 8191477 from 6b4a1303bbbf49ed47f3c3a47212a81f90330b69 to tm-frc-networking-release

Change-Id: I34ab210e0c1d1989a240fd24de413fde3884d604