ART: Verifier cleanup am: 86bf068459
am: 45009abbf8

Change-Id: I72398dda27bc3f41ebb8943d36a6364441b5e0e9