Merge "Handle null fields when using parcels." into udc-dev