am 54efee55: Merge "Make ObjectRegistry::InternalAdd GC safe"

* commit '54efee55ccfc9eb411b9fde6742fe457016a391d':
  Make ObjectRegistry::InternalAdd GC safe