Merge "ART: Clean-up d8 expections"