Merge "Fix adb mode naming check for device config"