Import translations. DO NOT MERGE am: 39973180c7  -s ours
am: fee92ba29d  -s ours

Change-Id: I533dfeef8074487d1814b21b7ac0a275752e8f9d