I think the answer should be both. Haibike and others continue to use Yamaha motors and I expect to see these new drives in their 2020 lineup. IMO Yamaha makes some of the best and quietest mid drive motors out there and I can't wait to test drive them.
Current Yamaha ebike Brands/Partners: https://global.yamaha-motor.com/business/e-bike-systems/brands/