Fix: ml2-plugin workaround

Change-Id: Id5dea765374858c35d80e536e77ed4a022c6eacb