Merge back 'pm-sleep' material for 3.19-rc1.