Merge "ART: Support object tagging"
am: 83805a2c02

Change-Id: I9b5e8d52f20c97508e74642cc3f5fa2c5f0c42a2