Merge "Remove duplicate string resource." into oc-dev