am be8b7763: Merge change 22178 into eclair

Merge commit 'be8b77636be041754e646f3ea03d8f2f858f9e05'

* commit 'be8b77636be041754e646f3ea03d8f2f858f9e05':
  - add a reset to EntityIterator to allow it to go back to the beginning