Merge "Watchdog: Print annotated stack trace, if possible" am: 2bd33a69d9
am: 0bc85c4e4d

Change-Id: I88e72448c88e6948de3f6d2e6f0f20d1a39a31a1