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

Change-Id: I9926f139af24fa83b901b9406e4f12ba2ea1b500