Merge "ART: Register object tagging table"
am: a2dca22534

Change-Id: Ia95c94f63a7f8468588d45951e08279cb2ecfef2