Merge "Remove unused fields from ObjectInputStream." into nyc-dev