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