Merge "Allow init to skip mounting /product and /product_services"