Merge "Fix typo in userspace-reboot-requested trigger"
am: 57292aa684

Change-Id: I3ebcf68ff22c6c73f8cece3628e96ba87242b965