Update from upstream

Some langdb changes and prevention of duplicate languages.

Change-Id: I3d0196c85f84b3aa830068932ff46c1ffce89d21
Merge "Update from upstream"