Merge branch 'stable-3.12' into stable-3.13

* stable-3.12:
  Skip plugins with malformed JSON metadata

Change-Id: I6467122a3ccf9ded61e65c1ae90b94a0b2eecfcb