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

Change-Id: I0e68fd613a18e34ab306ef501c465cb8d07a3a4b