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

* commit '9cc29ef968e6a4fa25618a73cd9d170aec7f8471':
  Remove incorrect iterator increment