Import translations. DO NOT MERGE am: ad0dfea172  -s ours
am: 217addf432  -s ours

Change-Id: Iac7336e1739740dd752e1e5d71b4ba9618ad5819