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

Change-Id: I0434b1d26fc22f7b97797c6cec2a1e85a66f304f