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

Change-Id: I9d461f188d20cbb81c3fceda4a38850650f096f6