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

Change-Id: I395f77ed3a958cad6957d9b7ca5c724fcff27a4b