Merge change I58acbafc

* changes:
  Fix for http://b/issue?id=2323459 and generics correctness on a WeakReference