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

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