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

Change-Id: I82c3c93168e7483092666fd7c1d58468b12e0cef