Merge "mm-core: update vpp related structures and enums."