am c490e4dc: am 85cd6a19: Merge "Fix tests that relied on ReferenceQueue ordering semantics."

* commit 'c490e4dc33f0fe2086ec8d9cd872b9a358801eab':
  Fix tests that relied on ReferenceQueue ordering semantics.