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

Change-Id: I367b4eeb1bb25240dc8c2fcfe89e1ef41dcccd62