Merge "Remove LangId related code." into oc-mr1-dev
am: 38bbbdfae6

Change-Id: I336cab55855dc43c42d73fdf363d8db016bdaf70