When there is no client listens to some DataItemId, we will remove
the map entry. Can't access the deleted entry's iterator anymore.
Change-Id: Id64aadebf7362667fbcf0fd5191f888ed9241727
CRs-Fixed: 3886536
(cherry picked from commit 0049d459cc1772f328e29a4c6b6d129af132e7b8)
Signed-off-by: therealmharc <therealmharc@gmail.com>