Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e am: e3a9ef31 am: 92e92747 Change-Id: I9ffac71a428113a70ec20cfcb1b3fe19479f4c2c