Snap for 8558685 from edeef9d2d5e7235812ecc7a7542d3a031c1e02a9 to tm-frc-networking-release

Change-Id: Idb4dd1b345c37dfd4d89b174e451ff6593964650