Change timeouts so shutdown is quicker

Change-Id: I9403ccfe7b730e58a4f515cbcd3b21832e4e8267