Import translations. DO NOT MERGE am: c00e04f148  -s ours
am: 1f0ff96186  -s ours

Change-Id: I6adadae0b05f3a2f0c5170b174f4e06b98f226fd