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