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

* commit '045d37ae20ae9481f6c967ab5db4240991ff151f':
  Make use of new method iterators.