Import translations. DO NOT MERGE am: 61e99fed5b
-s ours am: cce4c8e845
-s ours
am: afc6bbe462
-s ours
* commit 'afc6bbe462694f1f8671e6c43bea0ae9e40b3658':
Change-Id: I829a730374ff144e2d83075605e399527eabc37f
This commit is contained in: