Merge "Restore static instances after test completes" into tm-dev