Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  fixup!: Fix omitted import plugins and libraries

Change-Id: I5ca16189401eb017a1f1613dc0a1728187aed7d5