ART: Verifier cleanup am: f1468b53d0 am: 3cf2d2b875
am: 2e21acb203

Change-Id: Ic9356629c46c312803326f1aac29fbdffc1d13e5