ART: Verifier cleanup am: 0134a28ec4
am: 47ced43878

Change-Id: Id3c968be00c5104fd1c8670a2ff9cdddacab6a77