Merge "Snap for 8558685 from 21be1d68f5158540ed939a31763db9e2e8088782 to tm-frc-adbd-release" into tm-frc-adbd-release