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

Change-Id: I811150e2a0817466f387d562b4f1292d63c3a7c1