Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb