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

Change-Id: I6fb64e97deab45f11e495b98c3b90095b426376a