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