Import translations. DO NOT MERGE
am: 3813499c90  -s ours

Change-Id: I1c18d4efc4094dbe05d6ac2cc5ecdeb46f009ed5