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

Change-Id: I385f67c8b73b1cd9c56bcc63a59c130992bed779