Merge changes I207718d6,I700ef52e

* changes:
  ART: Restrict some checks in the verifier to P+
  ART: Add API level to verifier