Import translations. DO NOT MERGE am: 2c570117a8  -s ours
am: f8a7c81d66  -s ours

Change-Id: Ieb5ae5ad705792a6ba87f182531bca9666cddb4d