Import translations. DO NOT MERGE
am: 79e167f929  -s ours

Change-Id: I52297b8e79d0ef80d5b05ed0b45dd121f5396c34