Merge "Fix failures when l3_agent_scheduler ext is not available"