Import translations. DO NOT MERGE am: cc5fd487eb  -s ours
am: 105f962faa  -s ours

Change-Id: I2e67faa4152814ad92f41c710ef80a51f429c52a