Merge "ART: Fix missing Erase() in error case"