Surface: Add parcel/unparceling for missing field. am: 529a103fde am: aa516aca42
am: e476eadbbd

Change-Id: Ib48cdf37b9d91f83c62aa245d1e0ee88c92fdfcc