[automerger skipped] Merge "Add support for /product-services partition."
am: 18be1e2f7e  -s ours

Change-Id: I93bc4d81cd9d54fb312bd78490d04eee3dd85ad9