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

Change-Id: I1eed8502f81fcecd9a295ee8f121ae44c046d72b