Import translations. DO NOT MERGE am: 300ad2e4b0  -s ours
am: adfb58ac37  -s ours

Change-Id: I661ecca9565772febd4fb26027187de687d6e194