Merge "ART: Fix tagging"
am: 6f80f9e0ad

Change-Id: I0ab2151389f6289215d3deb4d65418b1700639db