Merge "Fix raw references to Iterator"