Snap for 8712302 from 4745695a5f4f0e5c787b748f18ccd165914ede75 to tm-frc-extservices-release

Change-Id: I59d332f326de373384716dee90434efb317439e5