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