Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a07
am: f14bf1ee93

Change-Id: Ibdc7f8e6c694931731069e08e5d725f28af87e2a