Merge "Remove unnecessary resource_setup in DvrRoutersNegativeTest"