diff --git a/core/lib/Drupal/Core/RequestInfo.php b/core/lib/Drupal/Core/RequestInfo.php
index bba0121..c9f54e7 100644
--- a/core/lib/Drupal/Core/RequestInfo.php
+++ b/core/lib/Drupal/Core/RequestInfo.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\Routing\RequestContext.
+ * Contains \Drupal\Core\RequestInfo.
  */
 
 namespace Drupal\Core;
@@ -11,7 +11,9 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Provides easy access to some routing related request information.
+ * Provides easy access to some routing and Drupal related request information.
+ *
+ * @see \Symfony\Cmf\Component\Routing\RouteObjectInterface
  */
 class RequestInfo {
 
diff --git a/core/modules/block/lib/Drupal/block/Theme/AdminDemoNegotiator.php b/core/modules/block/lib/Drupal/block/Theme/AdminDemoNegotiator.php
index 48c655b..370aa47 100644
--- a/core/modules/block/lib/Drupal/block/Theme/AdminDemoNegotiator.php
+++ b/core/modules/block/lib/Drupal/block/Theme/AdminDemoNegotiator.php
@@ -9,7 +9,6 @@
 
 use Drupal\Core\Theme\ThemeNegotiatorInterface;
 use Drupal\Core\RequestInfo;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**