Import translations. DO NOT MERGE am: d76d9b54cc  -s ours
am: fdf823a5b1  -s ours

Change-Id: Ibe93c5a6f72165c09c25f57a9ea20075baef4dcd