Import translations. DO NOT MERGE am: f39d5807a6  -s ours
am: 67e8b7b5f0  -s ours

Change-Id: I79aa151841c51b43a7e8950fe97951b50366044d