Merge "Fix debugger missing handle between adding and tagging object."
am: dffbbb6baa

Change-Id: Id894f1d2f72d00f3af4295bccae6f9050f609e1c