Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev