ART: Verifier cleanup am: fef91cc973 am: 3d37bf6cd3
am: 7457d9a503

Change-Id: Ie15da59657896dc965fb48e029d7b9a7b188deda