Merge "Cleaning up serialVersionUIDs"