Merge back earlier 'pm-sleep' material for v3.18.