Add plugin cleanup as part of standard TearDownTest. Upstream-commit: 0aefcd6ab660c21c6f7ed4486ab0033a99b9464a Component: engine