Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e0 am: e5b21c78 Change-Id: I6993b75986cd88762e5ae9acabbb9cbe1e4c8ddf