Merge branch 'stable-2.13' into stable-2.14 * stable-2.13: Deprecate plugin Change-Id: I556554a60bfd6f979a9ccfe151bd4f39ba6aea4b