Snap for 8558685 from 40ee5730f96f840b1be7cbe8daabddd543eba49b to tm-frc-extservices-release

Change-Id: I21c66aa155a4758d47fcd916bb51e37630a7fdcb