[ros-diffs] [tkreuzer] 46382: Add back acpi