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

Change-Id: Ic481522e134d17bbaaa3741208a3fee5426ce688