Merge "Revert "Use RRO for product-specific resources"" into main