Merge "Add support for /product-services partition."