Added debug messages and watchdog
am: 594931f5d9

Change-Id: Iaa6d60382dba87a19f6794201caf51ea7f90d23c