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

Change-Id: Ic59f0be0808325e8b773d49e72c021a31e4161c8