Import translations. DO NOT MERGE am: 6515783df6
-s ours am: 37c5dd0fe3
-s ours
am: a95e430c93
-s ours
Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
This commit is contained in: