Merge "Revert "Fix debugger missing handle between adding and tagging object.""
am: 85f692bc43

Change-Id: I25274033c55726076f6507b1a5405b847b675e88