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

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