ART: Verifier cleanup am: 4ec4d48940
am: 74d6b431e4

Change-Id: I03b8d00b9a583ac2aba4dcfbd0c53910b2fce878