Merge "ART: Correct static invariant checks"