diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
index 73b75dd..d3a1e97 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
@@ -29,7 +29,7 @@ class Roles extends PrerenderList {
    *
    * @var \Drupal\user\UserStorageControllerInterface
    */
-  protected $storage_controller;
+  protected $storageController;
 
   /**
    * Constructs a Drupal\Component\Plugin\PluginBase object.
@@ -80,11 +80,14 @@ public function preRender(&$values) {
 
     if ($uids) {
       $roles = user_roles();
-      $users_rids = $this->storage_controller->getUserRoles($uids);
+      $users_rids = $this->storageController->getUserRoles($uids);
       foreach ($users_rids as $uid => $rids) {
         foreach ($rids as $rid) {
-          $this->items[$uid][$rid]['role'] = check_plain($roles[$rid]->label());
-          $this->items[$uid][$rid]['rid'] = $rid;
+          // Don't list anonymous/authenticated user roles.
+          if (!in_array($rid, array(DRUPAL_AUTHENTICATED_RID, DRUPAL_ANONYMOUS_RID))) {
+            $this->items[$uid][$rid]['role'] = check_plain($roles[$rid]->label());
+            $this->items[$uid][$rid]['rid'] = $rid;
+          }
         }
       }
       // Sort the roles for each user by role weight.
diff --git a/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php b/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php
index 7f87200..5677d65 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php
@@ -16,13 +16,6 @@
 interface UserStorageControllerInterface extends EntityStorageControllerInterface {
 
   /**
-   * Add any roles from the storage to the user.
-   *
-   * @param array $users
-   */
-  public function addRoles(array $users);
-
-  /**
    * Save the user's roles.
    *
    * @param \Drupal\Core\Entity\EntityInterface $user
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 9adca37..341b6ea 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -42,7 +42,10 @@ function user_admin_account() {
   foreach (user_load_multiple($uids) as $account) {
     $users_roles = array();
     foreach ($account->getRoles() as $rid) {
-      $users_roles[] = $roles[$rid];
+      // Skip the authenticated user role.
+      if ($rid != DRUPAL_AUTHENTICATED_RID) {
+        $users_roles[] = $roles[$rid];
+      }
     }
     asort($users_roles);
     $username = array(