Merge "Use the correct method to unparcel the property map" into sc-dev