Merge "Allow merging product_services into /product"
am: 02d7d48d4a

Change-Id: Icefdfa28d9b8ca97aafb43ab1edd044fa975aae3