Merge "remove vr/libeds" into oc-dev