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

Change-Id: I64503d41665c9acefaeed02215e406bbc68f7ff5