Merge "Snap for 8580258 from aa9807c5125f631662911e54e65fe98ee469ce8e to tm-frc-adbd-release" into tm-frc-adbd-release