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

Change-Id: I3db3bb0c55a88a8771342f4d21c145dc7cd22fec