Merge "Revert "[People Service] Add throttling to DataManager add / change listener"" into tm-qpr-dev