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