10 seconds timeout after reverting snapshot

Change-Id: I9ebc9f2f4f573d4be1f9c1d25ea7c49b28aa07fb
Merge "10 seconds timeout after reverting snapshot"