Merge "ART: Add klass filter support"
am: e6cfabcb55

Change-Id: Iefde2183a19d1b9759de15f9f5af078badd6f0fc