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

Change-Id: I08516857bd76eadaf3934b0c298e4ae2f6348190