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

Change-Id: I8b870a72fd8b6d87cd3e06be16d94798f4ea680a