Merge "Fix Nubia's devices commands that contains underscore"