Merge "ART: Fix possible soft+hard failure in verifier" into lmp-mr1-dev