Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb