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: 7a902cd2 am: 225e9e10
Change-Id: Idd7b4cba8da170af718df4f46888f840c625cb79