Merge "Fix plugin reloading" into oc-dev
am: 39a259350e

Change-Id: Ifd64484b3e75c7ed860944eac33473d080613bf4