Import translations. DO NOT MERGE am: e124c9bd46  -s ours
am: 0cd75faa35  -s ours

Change-Id: I9554524b46c5e3e2b5597aeab9ea3debcb383c43