Import translations. DO NOT MERGE am: 6cf2d99816
-s ours am: bd3bd7d1e1
-s ours
am: 29978d1ee6
-s ours
Change-Id: I876d8498f240de3446cc7700ae36db901f6a8408
This commit is contained in: