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

Change-Id: Ia9efc035ed58eb08d8244ae1bfcb08ae1ab92718