Merge "Work around incorrect dt_needed entries"