Merge "Fix NPE in parcel constructor"