ART: Verifier cleanup am: fef91cc973
am: 3d37bf6cd3

Change-Id: I06515c9f6bfa45cbebfc5d60a0686a526d3d3a7c