Merge "Update PluginManager Import" into tm-qpr-dev