Merge "Patrol overhaul phase 1: Remove rcid parameters"