Merge "Allow all system configs in /product_services"