Adapt plugin to latest master

Change-Id: I243499ea491b3322a505d46edb6c1ebe48fad829
3 files changed