Merge "Rename IDumpstateListener errorcode"