Added debug messages and watchdog am: 594931f5d9
am: 75db0a70dd

Change-Id: I54bc7865d6abe84225daea1316b6b7425e40d63b