Merge "ART: Refactor ObjectTagTable"
am: fb005aa868

Change-Id: Ifcacf1d175048cb26b438b87fc7c606d33b0ea06