Merge "Add new owner to the resume-on-reboot module."