Merge "Resume-on-Reboot: use uevent to chown"