Merge back earlier ACPI PM material for v4.3.