Merge "Remove incorrect iterator increment"