Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e73 am: e3a9ef3166 am: 92e9274792

Change-Id: I9ffac71a428113a70ec20cfcb1b3fe19479f4c2c