Merge "Fix OTP performance with no Vendor ID device"