Sync with the latest changes from sleepd.