Increase WatchDog timeouts and improve formatting
Increase WatchDog timeouts and improve formatting

Change-Id: I08d4b55c12823e430b266cc8ffaf560dd8da1ab9

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst