ART: Verifier cleanup
am: 4ec4d48940

Change-Id: I835d98366275a3029bd49a55bffaf9997f26b3f0