diff --git a/core/core.services.yml b/core/core.services.yml
index 799e2e9..0d75946 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -492,7 +492,7 @@ services:
     arguments: ['@theme_handler', '@config.factory', '@config.installer', '@module_handler', '@config.manager', '@asset.css.collection_optimizer', '@router.builder', '@logger.channel.default', '@state']
   entity.manager:
     class: Drupal\Core\Entity\EntityManager
-    arguments: ['@entity_type.manager', '@entity_type.repository', '@entity_type.bundle.manager', '@entity_display.manager', '@entity_field.manager', '@entity_type.listener', '@entity_definition.repository', '@entity.repository', '@entity_bundle.listener', '@field_storage_definition.listener', '@field_definition.listener']
+    arguments: ['@entity_type.manager', '@entity_type.repository', '@entity_type.bundle.manager', '@entity_display.manager', '@entity_field.manager', '@entity_definition.repository', '@entity.repository', '@entity_type.listener', '@entity_bundle.listener', '@field_storage_definition.listener', '@field_definition.listener']
     # @todo Remove this tag in https://www.drupal.org/node/2549143.
     tags:
       - { name: plugin_manager_cache_clear }
diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityFieldManagerInterface.php
index 3acfd10..5db64dd 100644
--- a/core/lib/Drupal/Core/Entity/EntityFieldManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFieldManagerInterface.php
@@ -112,7 +112,7 @@ public function clearCachedFieldDefinitions();
    * @param bool $use_caches
    *   FALSE to not use any caches.
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function useCaches($use_caches = FALSE);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 0ec59c0..8d91948 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -42,7 +42,7 @@ class EntityForm extends FormBase implements EntityFormInterface {
    *
    * @var \Drupal\Core\Entity\EntityManagerInterface
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   protected $entityManager;
 
diff --git a/core/lib/Drupal/Core/Entity/EntityFormInterface.php b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
index 738440e..4bdd72a 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
@@ -138,7 +138,7 @@ public function setModuleHandler(ModuleHandlerInterface $module_handler);
    *
    * @return $this
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function setEntityManager(EntityManagerInterface $entity_manager);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 7e9bbb0..4d20c05 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -107,12 +107,12 @@ class EntityManager implements EntityManagerInterface {
    *   The entity display manager.
    * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
    *   The entity field manager.
-   * @param \Drupal\Core\Entity\EntityTypeListenerInterface $entity_type_listener
-   *   The entity type listener.
    * @param \Drupal\Core\Entity\EntityInstalledDefinitionRepositoryInterface $entity_installed_definition_repository
    *   The entity definition repository.
    * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity repository.
+   * @param \Drupal\Core\Entity\EntityTypeListenerInterface $entity_type_listener
+   *   The entity type listener.
    * @param \Drupal\Core\Entity\EntityBundleListenerInterface $entity_bundle_listener
    *   The entity bundle listener.
    * @param \Drupal\Core\Field\FieldStorageDefinitionListenerInterface $field_storage_definition_listener
@@ -120,15 +120,17 @@ class EntityManager implements EntityManagerInterface {
    * @param \Drupal\Core\Field\FieldDefinitionListenerInterface $field_definition_listener
    *   The field definition listener.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeRepositoryInterface $entity_type_repository, EntityTypeBundleManagerInterface $entity_type_bundle_manager, EntityDisplayManagerInterface $entity_display_manager, EntityFieldManagerInterface $entity_field_manager, EntityTypeListenerInterface $entity_type_listener, EntityInstalledDefinitionRepositoryInterface $entity_installed_definition_repository, EntityRepositoryInterface $entity_repository, EntityBundleListenerInterface $entity_bundle_listener, FieldStorageDefinitionListenerInterface $field_storage_definition_listener, FieldDefinitionListenerInterface $field_definition_listener) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeRepositoryInterface $entity_type_repository, EntityTypeBundleManagerInterface $entity_type_bundle_manager, EntityDisplayManagerInterface $entity_display_manager, EntityFieldManagerInterface $entity_field_manager, EntityInstalledDefinitionRepositoryInterface $entity_installed_definition_repository, EntityRepositoryInterface $entity_repository, EntityTypeListenerInterface $entity_type_listener, EntityBundleListenerInterface $entity_bundle_listener, FieldStorageDefinitionListenerInterface $field_storage_definition_listener, FieldDefinitionListenerInterface $field_definition_listener) {
     $this->entityTypeManager = $entity_type_manager;
     $this->entityTypeRepository = $entity_type_repository;
     $this->entityTypeBundleManager = $entity_type_bundle_manager;
+
     $this->entityDisplayManager = $entity_display_manager;
     $this->entityFieldManager = $entity_field_manager;
-    $this->entityTypeListener = $entity_type_listener;
     $this->entityInstalledDefinitionRepository = $entity_installed_definition_repository;
     $this->entityRepository = $entity_repository;
+
+    $this->entityTypeListener = $entity_type_listener;
     $this->entityBundleListener = $entity_bundle_listener;
 
     $this->fieldStorageDefinitionListener = $field_storage_definition_listener;
@@ -138,7 +140,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Ent
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function clearCachedDefinitions() {
     $this->entityTypeManager->clearCachedDefinitions();
@@ -154,7 +156,7 @@ public function clearCachedDefinitions() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getDefinition($entity_type_id, $exception_on_invalid = TRUE) {
     return $this->entityTypeManager->getDefinition($entity_type_id, $exception_on_invalid);
@@ -163,7 +165,7 @@ public function getDefinition($entity_type_id, $exception_on_invalid = TRUE) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function hasHandler($entity_type, $handler_type) {
     return $this->entityTypeManager->hasHandler($entity_type, $handler_type);
@@ -172,7 +174,7 @@ public function hasHandler($entity_type, $handler_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getStorage($entity_type) {
     return $this->entityTypeManager->getStorage($entity_type);
@@ -181,7 +183,7 @@ public function getStorage($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getListBuilder($entity_type) {
     return $this->entityTypeManager->getListBuilder($entity_type);
@@ -190,7 +192,7 @@ public function getListBuilder($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFormObject($entity_type, $operation) {
     return $this->entityTypeManager->getFormObject($entity_type, $operation);
@@ -199,7 +201,7 @@ public function getFormObject($entity_type, $operation) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getRouteProviders($entity_type) {
     return $this->entityTypeManager->getRouteProviders($entity_type);
@@ -208,7 +210,7 @@ public function getRouteProviders($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getViewBuilder($entity_type) {
     return $this->entityTypeManager->getViewBuilder($entity_type);
@@ -217,7 +219,7 @@ public function getViewBuilder($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getAccessControlHandler($entity_type) {
     return $this->entityTypeManager->getAccessControlHandler($entity_type);
@@ -226,7 +228,7 @@ public function getAccessControlHandler($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getHandler($entity_type, $handler_type) {
     return $this->entityTypeManager->getHandler($entity_type, $handler_type);
@@ -235,7 +237,7 @@ public function getHandler($entity_type, $handler_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function createHandlerInstance($class, EntityTypeInterface $definition = null) {
     return $this->entityTypeManager->createHandlerInstance($class, $definition);
@@ -244,7 +246,7 @@ public function createHandlerInstance($class, EntityTypeInterface $definition =
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getBaseFieldDefinitions($entity_type_id) {
     return $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
@@ -253,7 +255,7 @@ public function getBaseFieldDefinitions($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFieldDefinitions($entity_type_id, $bundle) {
     return $this->entityFieldManager->getFieldDefinitions($entity_type_id, $bundle);
@@ -262,7 +264,7 @@ public function getFieldDefinitions($entity_type_id, $bundle) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFieldStorageDefinitions($entity_type_id) {
     return $this->entityFieldManager->getFieldStorageDefinitions($entity_type_id);
@@ -271,7 +273,7 @@ public function getFieldStorageDefinitions($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function setFieldMap(array $field_map) {
     return $this->entityFieldManager->setFieldMap($field_map);
@@ -280,7 +282,7 @@ public function setFieldMap(array $field_map) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFieldMap() {
     return $this->entityFieldManager->getFieldMap();
@@ -289,7 +291,7 @@ public function getFieldMap() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFieldMapByFieldType($field_type) {
     return $this->entityFieldManager->getFieldMapByFieldType($field_type);
@@ -298,7 +300,7 @@ public function getFieldMapByFieldType($field_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldDefinitionCreate(FieldDefinitionInterface $field_definition) {
     $this->fieldDefinitionListener->onFieldDefinitionCreate($field_definition);
@@ -307,7 +309,7 @@ public function onFieldDefinitionCreate(FieldDefinitionInterface $field_definiti
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldDefinitionUpdate(FieldDefinitionInterface $field_definition, FieldDefinitionInterface $original) {
     $this->fieldDefinitionListener->onFieldDefinitionUpdate($field_definition, $original);
@@ -316,7 +318,7 @@ public function onFieldDefinitionUpdate(FieldDefinitionInterface $field_definiti
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldDefinitionDelete(FieldDefinitionInterface $field_definition) {
     $this->fieldDefinitionListener->onFieldDefinitionDelete($field_definition);
@@ -325,7 +327,7 @@ public function onFieldDefinitionDelete(FieldDefinitionInterface $field_definiti
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function clearCachedFieldDefinitions() {
     return $this->entityFieldManager->clearCachedFieldDefinitions();
@@ -334,7 +336,7 @@ public function clearCachedFieldDefinitions() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function clearCachedBundles() {
     $this->entityTypeBundleManager->clearCachedBundles();
@@ -343,7 +345,7 @@ public function clearCachedBundles() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getBundleInfo($entity_type) {
     return $this->entityTypeBundleManager->getBundleInfo($entity_type);
@@ -352,7 +354,7 @@ public function getBundleInfo($entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getAllBundleInfo() {
     return $this->entityTypeBundleManager->getAllBundleInfo();
@@ -368,7 +370,7 @@ public function getExtraFields($entity_type_id, $bundle) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getEntityTypeLabels($group = FALSE) {
     return $this->entityTypeRepository->getEntityTypeLabels($group);
@@ -377,7 +379,7 @@ public function getEntityTypeLabels($group = FALSE) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = array()) {
     return $this->entityRepository->getTranslationFromContext($entity, $langcode, $context);
@@ -386,7 +388,7 @@ public function getTranslationFromContext(EntityInterface $entity, $langcode = N
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getAllViewModes() {
     return $this->entityDisplayManager->getAllViewModes();
@@ -395,7 +397,7 @@ public function getAllViewModes() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getViewModes($entity_type_id) {
     return $this->entityDisplayManager->getViewModes($entity_type_id);
@@ -404,7 +406,7 @@ public function getViewModes($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getAllFormModes() {
     return $this->entityDisplayManager->getAllFormModes();
@@ -413,7 +415,7 @@ public function getAllFormModes() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFormModes($entity_type_id) {
     return $this->entityDisplayManager->getFormModes($entity_type_id);
@@ -422,7 +424,7 @@ public function getFormModes($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getViewModeOptions($entity_type_id) {
     return $this->entityDisplayManager->getViewModeOptions($entity_type_id);
@@ -431,7 +433,7 @@ public function getViewModeOptions($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFormModeOptions($entity_type_id) {
     return $this->entityDisplayManager->getFormModeOptions($entity_type_id);
@@ -440,7 +442,7 @@ public function getFormModeOptions($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getViewModeOptionsByBundle($entity_type_id, $bundle) {
     return $this->entityDisplayManager->getViewModeOptionsByBundle($entity_type_id, $bundle);
@@ -449,7 +451,7 @@ public function getViewModeOptionsByBundle($entity_type_id, $bundle) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getFormModeOptionsByBundle($entity_type_id, $bundle) {
     return $this->entityDisplayManager->getFormModeOptionsByBundle($entity_type_id, $bundle);
@@ -458,7 +460,7 @@ public function getFormModeOptionsByBundle($entity_type_id, $bundle) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function clearDisplayModeInfo() {
     $this->entityDisplayManager->clearDisplayModeInfo();
@@ -467,7 +469,7 @@ public function clearDisplayModeInfo() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function loadEntityByUuid($entity_type_id, $uuid) {
     return $this->entityRepository->loadEntityByUuid($entity_type_id, $uuid);
@@ -476,7 +478,7 @@ public function loadEntityByUuid($entity_type_id, $uuid) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function loadEntityByConfigTarget($entity_type_id, $target) {
     return $this->entityRepository->loadEntityByConfigTarget($entity_type_id, $target);
@@ -485,7 +487,7 @@ public function loadEntityByConfigTarget($entity_type_id, $target) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getEntityTypeFromClass($class_name) {
     return $this->entityTypeRepository->getEntityTypeFromClass($class_name);
@@ -501,7 +503,7 @@ public function onEntityTypeCreate(EntityTypeInterface $entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeInterface $original) {
     $this->entityTypeListener->onEntityTypeUpdate($entity_type, $original);
@@ -510,7 +512,7 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onEntityTypeDelete(EntityTypeInterface $entity_type) {
     $this->entityTypeListener->onEntityTypeDelete($entity_type);
@@ -519,7 +521,7 @@ public function onEntityTypeDelete(EntityTypeInterface $entity_type) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldStorageDefinitionCreate(FieldStorageDefinitionInterface $storage_definition) {
     $this->fieldStorageDefinitionListener->onFieldStorageDefinitionCreate($storage_definition);
@@ -528,7 +530,7 @@ public function onFieldStorageDefinitionCreate(FieldStorageDefinitionInterface $
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldStorageDefinitionUpdate(FieldStorageDefinitionInterface $storage_definition, FieldStorageDefinitionInterface $original) {
     $this->fieldStorageDefinitionListener->onFieldStorageDefinitionUpdate($storage_definition, $original);
@@ -537,7 +539,7 @@ public function onFieldStorageDefinitionUpdate(FieldStorageDefinitionInterface $
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onFieldStorageDefinitionDelete(FieldStorageDefinitionInterface $storage_definition) {
     $this->fieldStorageDefinitionListener->onFieldStorageDefinitionDelete($storage_definition);
@@ -546,7 +548,7 @@ public function onFieldStorageDefinitionDelete(FieldStorageDefinitionInterface $
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onBundleCreate($bundle, $entity_type_id) {
     $this->entityBundleListener->onBundleCreate($bundle, $entity_type_id);
@@ -555,7 +557,7 @@ public function onBundleCreate($bundle, $entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onBundleRename($bundle_old, $bundle_new, $entity_type_id) {
     $this->entityBundleListener->onBundleRename($bundle_old, $bundle_new, $entity_type_id);
@@ -564,7 +566,7 @@ public function onBundleRename($bundle_old, $bundle_new, $entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function onBundleDelete($bundle, $entity_type_id) {
     $this->entityBundleListener->onBundleDelete($bundle, $entity_type_id);
@@ -573,7 +575,7 @@ public function onBundleDelete($bundle, $entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getLastInstalledDefinition($entity_type_id) {
     return $this->entityInstalledDefinitionRepository->getLastInstalledDefinition($entity_type_id);
@@ -593,7 +595,7 @@ public function useCaches($use_caches = FALSE) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getLastInstalledFieldStorageDefinitions($entity_type_id) {
     return $this->entityInstalledDefinitionRepository->getLastInstalledFieldStorageDefinitions($entity_type_id);
@@ -602,7 +604,7 @@ public function getLastInstalledFieldStorageDefinitions($entity_type_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getDefinitions() {
     return $this->entityTypeManager->getDefinitions();
@@ -611,7 +613,7 @@ public function getDefinitions() {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function hasDefinition($plugin_id) {
     return $this->entityTypeManager->hasDefinition($plugin_id);
@@ -620,7 +622,7 @@ public function hasDefinition($plugin_id) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function createInstance($plugin_id, array $configuration = []) {
     return $this->entityTypeManager->createInstance($plugin_id, $configuration);
@@ -629,7 +631,7 @@ public function createInstance($plugin_id, array $configuration = []) {
   /**
    * {@inheritdoc}
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getInstance(array $options) {
     return $this->entityTypeManager->getInstance($options);
diff --git a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
index 6d5c5cf..c0e8816 100644
--- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
@@ -13,32 +13,21 @@
 /**
  * Provides an interface for entity type managers.
  *
- * Note: The following interfaces that are extended are deprecated as of 8.0.0
- * and will be removed in 9.0.0:
- * - \Drupal\Core\Entity\EntityTypeManagerInterface
- * - \Drupal\Core\Entity\EntityTypeRepositoryInterface
- * - \Drupal\Core\Entity\EntityTypeBundleManagerInterface
- * - \Drupal\Core\Entity\EntityDisplayManagerInterface
- * - \Drupal\Core\Entity\EntityFieldManagerInterface
- * - \Drupal\Core\Entity\EntityTypeListenerInterface
- * - \Drupal\Core\Entity\EntityRepositoryInterface
- * - \Drupal\Core\Entity\EntityBundleListenerInterface
- * - \Drupal\Core\Field\FieldStorageDefinitionListenerInterface
- * - \Drupal\Core\Field\FieldDefinitionListenerInterface
+ * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
  */
 interface EntityManagerInterface extends EntityTypeListenerInterface, EntityBundleListenerInterface, FieldStorageDefinitionListenerInterface, FieldDefinitionListenerInterface, EntityTypeManagerInterface, EntityTypeRepositoryInterface, EntityTypeBundleManagerInterface, EntityDisplayManagerInterface, EntityFieldManagerInterface, EntityRepositoryInterface {
 
   /**
    * @see \Drupal\Core\Entity\EntityInstalledDefinitionRepositoryInterface::getLastInstalledDefinition()
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getLastInstalledDefinition($entity_type_id);
 
   /**
    * @see \Drupal\Core\Entity\EntityInstalledDefinitionRepositoryInterface::getLastInstalledFieldStorageDefinitions()
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
   public function getLastInstalledFieldStorageDefinitions($entity_type_id);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
index 0f23f62..c152ebf 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
@@ -50,7 +50,7 @@ public function getEntityTypeFromClass($class_name);
   /**
    * Clear the static cache.
    *
-   * @deprecated
+   * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    *
    * @todo Remove in https://www.drupal.org/node/2549143.
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
index c643294..c2325d4 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\Core\Entity\EntityTypeManagerTest.
  */
 
-namespace Drupal\Tests\Core\Entity {
+namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
@@ -508,15 +508,3 @@ public static function create(ContainerInterface $container) {
 class TestRouteProvider extends EntityHandlerBase {
 
 }
-
-}
-
-namespace {
-
-  /**
-   * Implements hook_entity_type_build().
-   */
-  function entity_manager_test_module_entity_type_build() {
-  }
-
-}