Snap for 8558685 from bfbbb04c096deccf43ad1c52e80c399a7be985ed to tm-frc-extservices-release

Change-Id: I2d811e326597e893b8e692eec2b64dfe49756e42