Merge "Fix test not willing to retrieve bluetooth name" into tm-dev