Merge "Add a very basic userspace reboot watchdog" am: dc4bd2714c
am: c09c9a7aa3

Change-Id: I0bae24930a593584ac70f780b87fd181af9fc7ac