Bug 1223585wq Use dict extension methods instead of overriding make_router_dict in order to make this extension consistent with all the others. Change-Id: I94fa7e70e5a869963ec4dfa9de85c8d922976843