Merge "Ensure userspace reboot is supported before logging" am: feb3b2ace2

Change-Id: I5ec9195ac3beff35a0e9086f8b43502dad583e1c