Merge "Reboot the device before checking OTP"