Refactor Api LangAttributes to Terms

Change-Id: I60d359f14aba354946425b2f2072749dbc78709e
Merge "Refactor Api LangAttributes to Terms"