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

Change-Id: I8d3a66879523947eb81354798c09e1309f063bb4