Merge "Change the timeout for integrity verification from 10 seconds to 30 seconds." into rvc-dev