Merge "Fix intermittent crash in property_service_test"