Merge "Watchdog: Print annotated stack trace, if possible"