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