Merge "ART: Switch tagging table to a map"
am: dfa8f188a0

Change-Id: Ib8e0a29e9be2510c9b372c8effa1004351aa1307