Merge "Reset static instances before a test" into tm-qpr-dev