Merge "ART: Fix GetErrorName." into oc-dev