Merge "Surface: Add parcel/unparceling for missing field." into nyc-mr1-dev