Merge changes from topic "agampe:a-b-ota:vendor-product-logical-partitions"
am: 2c0b5118c3

Change-Id: I877a2eb1f00ba520287f6add55eb942d56893eb6