Merge "Support /product-services partition"