Merge "Add checks for types in Parcel / avoid class initialization"