Import translations. DO NOT MERGE am: 9a2f574fce  -s ours
am: 50cdecd821  -s ours

Change-Id: Icabaee09ce2958f4aa9594468c02edae1882738c