Merge "ART: Fix nits for verifier change"