Merge "Fix UnmodifiableEntrySet.toArray() ordering"