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
Change-Id: Ib2c8e3ab6a053fdaa8213e706d1afeef882e9c1a