Import translations. DO NOT MERGE am: b43b49c643
-s ours am: 9190e13af2
-s ours
am: 6537a961dd
-s ours
Change-Id: I18ba1b1d6dc7fe09dbb72136f63880245ac04e93
This commit is contained in: