am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"

* commit '6837f4a44235f96d410190806448ddf43d2fe696':
  Fix Watchdog HeartbeatHandler to run on correct thread