Merge "Revert "Changing readParcelable and readSerializable's method signatures.""