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

* commit 'd8b525c398aeda1f583ed4ed90450e0a0fc9b6ef':
  Increase the default timeout from 30 to 60 seconds.