am 6bb5bf61: Merge "Add watchdog.h"

* commit '6bb5bf6108c36cf17f18d2d7b1c01ad5f8e9be42':
  Add watchdog.h