Merge "Add --no-resource-deduping to RROs" into pi-car-dev