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

Change-Id: Iba33ec3e3820bfef7d0f23abd4bbb0d0f79ad1ff