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

Change-Id: I22a4a8e6599e46a0c3aba931af82bf98d7f48ece