Automatic merge from submit-queue

Removed TODO that renaming ReplicationManager.

**What this PR does / why we need it**:
Updated comments to avoid potential PRs on renaming.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # N/A

**Release note**:

```release-note-none
```