Import translations. DO NOT MERGE am: 58d444ff5f  -s ours am: e6ff25e165  -s ours
am: b7d791d8dc  -s ours

* commit 'b7d791d8dc853679caf5807bcefb7fd0b398cfbd':

Change-Id: Ib298bceca7cd56738afdf96adb4a5eebc6f549c5