add countdown timeout & fix restart feature

Change-Id: I7ddc5a27a8eca65766723f9b98555d219bafb3a0