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

Change-Id: Ided900878612e7d179d9f4ad8dde698d2fed3209