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