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