Merge "Cleanup dead code in TrafficControllerTest"