Import translations. DO NOT MERGE am: 535dd7f066
-s ours am: 363626edcf
-s ours
am: f8f6cb368d
-s ours
Change-Id: I8b992a197206c0ae4371b1846d9273645c047062
This commit is contained in: