Import translations. DO NOT MERGE
am: e93b21e090  -s ours

Change-Id: Id83ec2cd7a700ae4b7e3b0d4936a137bba49a443