Import translations. DO NOT MERGE am: 64d3e22e11
-s ours am: 9f8644c04f
-s ours
am: d13a041835
-s ours
Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779
This commit is contained in: