Import translations. DO NOT MERGE am: fdb2a9ab61
-s ours am: f7e4533931
-s ours
am: 45aa5c8cd0
-s ours
Change-Id: I40ad8443a92fecb273f5681a4a1d4c3c329107ff
This commit is contained in: