Import translations. DO NOT MERGE am: 2deaba905f  -s ours
am: ea9b82baaa  -s ours

Change-Id: I6641d322dc758f0c0a487a961da451efa6fa2c98