Merge "Revert "Have property_service create a serialized property_contexts file""