Merge "Remove incorrect iterator increment"
am: a341377bd5

* commit 'a341377bd5eb7cef471cb29a382e1614523e5a6c':
  Remove incorrect iterator increment