Merge "Swap target_required by device_common_data" into main