diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php
index 3bae06d..e3496de 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\comment\Plugin\views\row\CommentRow.
+ * Contains \Drupal\comment\Plugin\views\row\CommentRow.
  */
 
 namespace Drupal\comment\Plugin\views\row;
 
-use Drupal\system\Plugin\views\row\EntityRow;
+use Drupal\views\Plugin\views\row\EntityRow;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -27,7 +27,7 @@
 class CommentRow extends EntityRow {
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::defineOptions().
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
@@ -37,7 +37,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::buildOptionsForm().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::buildOptionsForm().
    */
   public function buildOptionsForm(&$form, &$form_state) {
     parent::buildOptionsForm($form, $form_state);
@@ -50,7 +50,7 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::render().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::render().
    */
   function render($row) {
     $entity_id = $row->{$this->field_alias};
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php
index e096fc2..bf2eb20 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\row\NodeRow.
+ * Contains \Drupal\node\Plugin\views\row\NodeRow.
  */
 
 namespace Drupal\node\Plugin\views\row;
@@ -10,7 +10,7 @@
 use Drupal\views\ViewExecutable;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
-use Drupal\system\Plugin\views\row\EntityRow;
+use Drupal\views\Plugin\views\row\EntityRow;
 
 /**
  * Plugin which performs a node_view on the resulting object.
@@ -32,7 +32,7 @@
 class NodeRow extends EntityRow {
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::defineOptions().
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
@@ -46,7 +46,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::buildOptionsForm().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::buildOptionsForm().
    */
   public function buildOptionsForm(&$form, &$form_state) {
     parent::buildOptionsForm($form, $form_state);
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php
index b7d1de0..dd1a9be 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\user\Plugin\views\row\UserRow.
+ * Contains \Drupal\user\Plugin\views\row\UserRow.
  */
 
 namespace Drupal\user\Plugin\views\row;
 
-use Drupal\system\Plugin\views\row\EntityRow;
+use Drupal\views\Plugin\views\row\EntityRow;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -29,7 +29,7 @@
 class UserRow extends EntityRow {
 
   /**
-   * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions().
+   * Overrides \Drupal\views\Plugin\views\row\EntityRow::defineOptions().
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
similarity index 95%
rename from core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
index 0a5ef91..ef3e046 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\system\Plugin\views\row\EntityRow.
+ * Definition of Drupal\views\Plugin\views\row\EntityRow.
  */
 
-namespace Drupal\system\Plugin\views\row;
+namespace Drupal\views\Plugin\views\row;
 
 use Drupal\views\Plugin\views\row\RowPluginBase;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -69,7 +69,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['view_mode'] = array('default' => '');
+    $options['view_mode'] = array('default' => NULL);
 
     return $options;
   }