Import translations. DO NOT MERGE am: bdd42af760  -s ours
am: b135979b24  -s ours

Change-Id: I51f6c18c8b5bd708e9a918333be4c529ceb51877