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

Change-Id: I618fcab94211da7b259b4761faeb26daea658a48