Import translations. DO NOT MERGE am: 9ae05458f0
-s ours am: b2cc06ea43
-s ours
am: 97e5272958
-s ours
Change-Id: I6b5222e2b795f7c08279ca142eada5087cb2803a
This commit is contained in: