Import translations. DO NOT MERGE am: 5afd06f076  -s ours
am: 79de5f7cc8  -s ours

Change-Id: I962b434b9fbb4ed18b6b9eda8cb4e6de0e7c1636