Import translations. DO NOT MERGE am: 75bc8248da  -s ours
am: 6dfe1fb690  -s ours

Change-Id: Iee369cb67e70a438c24c11d6376ac3ca9189cbb0