Merge "Add support for /product-services partition." into stage-aosp-master am: d99a836380 am: 351d1f3f93
am: 404bcf3ac7

Change-Id: I175dde7c8b4527cc538ce50e58f6969115812fba