Merge "Remove 2 goto statements for wrongDevice"