Merge "Remove LangId related code." into oc-mr1-dev