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

Change-Id: If768f7df0aed1d9d3cb911474e845e5376435945