Merge from vendor branch INTEL_ACPICA: