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: fedb8855 am: fe2f6253 am: 1c822a6b
Change-Id: Ibc924f8e7d8d8c411c4fff6412cceb126868d308