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