Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours am: 57b56329f3 -s ours
am: 9a1589ad6a -s ours
Change-Id: Iab860b955d46457f9ccf482394f5d45a9a1a1389
This commit is contained in: