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

Change-Id: I167161b7cd08520ab5e8e71158ddc58883823955