Import translations. DO NOT MERGE am: 516aac32ae  -s ours
am: e4168624f1  -s ours

Change-Id: Ib04b474540f39981f47cf2a0bc8d3bf477e4b28a