Merge "Allow product partition to have vendor_overlay"