Merge "Use Map.Entry, not HashMap.Entry"