Fix RR2 calls that were broken by the addition of a new device-device association