[automerger skipped] Merge "Ensure userspace reboot is supported before...
[automerger skipped] Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e -s ours
am skip reason: Change-Id Ic3041ff3abe0d2641d3d99fc8e816f1f5c491a34 with SHA-1 eb52a694 is in history
Change-Id: Ib47a2548e9202c9c3d16b209c50b17bbfb3c9575