Merge branch 'stable-2.12'

* stable-2.12:
  Build with plugin API 2.12 final release

Change-Id: I0ab3818aa39e18ead7025de7baaacf0047ae5187