Import translations. DO NOT MERGE
am: 82eff79103  -s ours

Change-Id: I56e2ce78f4d4dc4985b789b6a45c0fabaeac096f