Using wrapper functions, and simplified query for language names.

Change-Id: If31f5e56baf35350e5548bbfaaccbe288690894a
Merge "Using wrapper functions, and simplified query for language names."