Merge "Refactor ProductConfigProperties to use a struct key instead of an string key with hardcoded patterns."