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