Merge "Fix L3AgentSchedulerTestJSON failure for dvr routers"