Merge "Fix typos in IEvsEnumerator descriptive comment" into oc-dev