Fix third party imports using optional import block in agent contrib files

Fix third party imports using optional import block in agent contrib files #102