Merge "Fix flaky tests caused by WeakReference"