Merge "Parcel_host.java: match Parcel.java error conditions better" into main