Import translations. DO NOT MERGE am: f2f3fbc6c3  -s ours
am: 1ead214859  -s ours

Change-Id: Idcdf17b07d1d82eb17c3aad5f52fcad42416f092