converted plugin to new plugin strategy

Change-Id: I028249e6dba8e5a8ea55901974bd7ddcb53954a1