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