Merge "ART: Handle Extended MIRs in a uniform manner"