Merge "Make use of new method iterators." am: 045d37ae20
am: c4affaa361

* commit 'c4affaa361cd73681ad9c493b5b41fae94fb5be0':
  Make use of new method iterators.