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 am: cc53a0aa
Change-Id: Ia0569449f4333f21678c4afc4459b96b26216778