Merge "Fix a bug in EditIterator."