Merge "Ensure userspace reboot is supported before logging" am: feb3b2ac am: 4f93aa3e am: df8ec96c am: afed242e Change-Id: I4b736d5325d0ae5b2ae59af91889a3383507e346