ART: Verifier cleanup am: f1468b53d0
am: 3cf2d2b875

Change-Id: Ic00731005bdd3c24703c37603e68af0d599d3543