Import translations. DO NOT MERGE
am: 791ebeed32  -s ours

Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d