Merge "Remove incorrect iterator increment" am: a341377bd5 am: 9cc29ef968
am: ac0e964f93

* commit 'ac0e964f93012cb2c6bd43cbafd0a9b4e8db0cbc':
  Remove incorrect iterator increment