Merge "add device nubia Z17"