Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I61bba9cf5a6c9276c93116f412fb37d2bc3d09cb