Merge "Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a am: f14bf1ee" into qt-qpr1-dev-plus-aosp