Merge "Fix typo in userspace reboot watchdog"
am: 4ac630b562

Change-Id: I825d646a7f86e17b43b75cd4c422867fb110a6cb