Merge "Fix serialization in CopyOnWriteArrayList."