Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours am: f8b4927683
-s ours
am: f55f67e409
-s ours
Change-Id: I650772657134b60a80f91d2dd0f5d740233aecbc
This commit is contained in: