Merge changes If3c488a2,Iab08c4a3

* changes:
  Clear spiedInstance field for spyOn objects.
  Track and reset mock to avoid mem leaks.