Import translations. DO NOT MERGE am: c840db9557  -s ours
am: abbf7b825b  -s ours

Change-Id: I1a37881e27d344a7edc3040c5d28010bd6f95e5f