Snap for 8712302 from da647bd309dfea36069d4340d1df252867c51529 to tm-frc-extservices-release

Change-Id: I169ef653d6fd00adbee835c8ed9db229ba75aa8f