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

Change-Id: I835f2f85881fcb8c39e4f6c4e0e5d781f6a35b50