Import translations. DO NOT MERGE am: f0f33ea959  -s ours
am: 82bef625b8  -s ours

Change-Id: I91f9d769574a51540660bee56208c0cf42b4a8f9