am a64325f6: am 7c6be10d: Remove iterators (DO NOT MERGE)

* commit 'a64325f6e70569255ff395a85ec161f3230f9e35':
  Remove iterators (DO NOT MERGE)