ART: Verifier cleanup am: e0bbab9fe1
am: 30bc83fcc0

Change-Id: I8cc6f5447f0fb34299f78b39f87ed5b79e90cf7a