This will allow to more easily use it later when we add API support for listing plugins, etc. Change-Id: Ife8bc059b1ebcbe86e0f2f2c1d32cb6f260075f2