Merge "Change the timeout for integrity verification from 10 seconds to 30...
Merge "Change the timeout for integrity verification from 10 seconds to 30 seconds." into rvc-dev am: bc9515e4 am: 432ec22b am: b6426c13
Change-Id: I4a3a64882f1cdfe69c79131d63c207f71fdbde01