Import translations. DO NOT MERGE am: 0f156bf40d  -s ours
am: d5d067f2e8  -s ours

Change-Id: I0f238325dd52951c41575fc3ae4efeeaec4e6821