Adapt plugin to latest master

Change-Id: I3b0778295141e6f2f6bc0be2937a9af3dc80a33a
9 files changed