Merge "Fix broken bluetooth robo tests"