Merge branch 'stable-3.3'

* stable-3.3:
  Adapt to recent change in plugin API

Change-Id: Ia0398084f1771d52c0f345f87e5592d752e87b99