Merge branch 'stable-2.14'

* stable-2.14:
  Deprecate plugin

Change-Id: I3f20c82b35f8e941d200303aad36b63f87476e8d