Import translations. DO NOT MERGE am: 313c31a2d7  -s ours
am: 6e85f40a98  -s ours

Change-Id: I52c5ecee93405a467344fdaf95e808bf790f3a5e