Import translations. DO NOT MERGE
am: fbdea47c44  -s ours

Change-Id: I791dd2ed3d53ac4230748c61169677190e143919