Merge back earlier 'pm-runtime' material for 3.19-rc1.