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