Import translations. DO NOT MERGE am: 8e132ce53c -s ours am: 7c952faa77 -s ours
am: 3c2a60e813 -s ours
Change-Id: Ifa974eb7ed6d61b78e2aac66c027b40920948e03
This commit is contained in: