Merge "Revert "Fix debugger missing handle between adding and tagging object."" am: 85f692bc am: 7c075399 am: 435a144c Change-Id: I7df4305556b4f9331e60d35c2dc70f423c9a1b0b